🎖️GitЯра🎖️
Commit 4257e7b7e4483b605497b97d29054b0affa977d1
Parents : 14e86b9
Author : James Rich <2199651+jamesarich@users.noreply.github.com>
Signature : Signature validation error
Date : 2026-04-17T21:41:36-05:00
Committer : GitHub <noreply@github.com>
Date : 2026-04-17T21:41:36-05:00
chore(deps): split androidx-compose version ref from CMP (#5183)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Changes
2 files changed, 20 insertions(+), 5 deletions(-)
Diff
diff --git a/.github/renovate.json b/.github/renovate.json
index dda9390c3a..1faa1a4adb 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -56,6 +56,15 @@
"changelogUrl": "https://github.com/meshtastic/protobufs/compare/{{currentDigest}}...{{newDigest}}",
"automerge": true
},
+ {
+ "description": "Group CMP and the androidx.compose artifacts that track it so Renovate bumps them together (see PR #5180)",
+ "groupName": "compose-multiplatform",
+ "matchPackageNames": [
+ "/^org\\.jetbrains\\.compose/",
+ "androidx.compose.runtime:runtime-tracing",
+ "androidx.compose.ui:ui-test-manifest"
+ ]
+ },
{
"description": "Restrict sensitive infrastructure to manual minor updates",
"matchUpdateTypes": [
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 91f2ea6b72..73286aff3f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,11 +35,17 @@ turbine = "1.2.1"
# Compose Multiplatform
compose-multiplatform = "1.11.0-beta02"
compose-multiplatform-material3 = "1.11.0-alpha06"
+# `androidx-compose-bom-aligned` tracks androidx.compose.{runtime,ui} test/tracing
+# artifacts that ship in lockstep with CMP. Kept as a separate version ref so Renovate
+# can bump androidx releases (which often land first) without dragging the
+# `org.jetbrains.compose:*` artifacts and Gradle plugin to a version JetBrains
+# hasn't published yet (see PR #5180). Should normally match `compose-multiplatform`;
+# AndroidCompose.kt's resolutionStrategy force-aligns these groups to the CMP version
+# at resolution time regardless of the declared value here.
+androidx-compose-bom-aligned = "1.11.0-beta02"
# `androidx-compose-material` (M2) is independent of CMP and pinned separately
# because some third-party libs (maps-compose-widgets, datadog) drag in
-# unversioned material transitives. Test/tracing artifacts in the
-# androidx.compose.{runtime,ui} groups MUST track CMP — use compose-multiplatform
-# as their version ref, not a separate pin.
+# unversioned material transitives.
androidx-compose-material = "1.7.8"
jetbrains-adaptive = "1.3.0-alpha06"
@@ -122,8 +128,8 @@ androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version
androidx-work-testing = { module = "androidx.work:work-testing", version = "2.11.2" }
# AndroidX Compose (explicit versions — BOM removed; CMP is the sole version authority)
-androidx-compose-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "compose-multiplatform" }
-androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose-multiplatform" } # Required by Robolectric Compose tests (registers ComponentActivity)
+androidx-compose-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "androidx-compose-bom-aligned" }
+androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose-bom-aligned" } # Required by Robolectric Compose tests (registers ComponentActivity)
# Compose Multiplatform
compose-multiplatform-animation = { module = "org.jetbrains.compose.animation:animation", version.ref = "compose-multiplatform" }
Served by rngit 1.5.0 - Generated in 0.05s